Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 4 Sep 2011 18:55:40 +0000 (11:55 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 4 Sep 2011 18:55:40 +0000 (11:55 -0700)
commit6180fe345cd7edbbab214e7a353c5546c4a5e95d
tree2ca10f6e3b6cb29114b70c48dc95bc2f9c94bc38
parent4f197509c94825174c78c04d7ff95c9c0d667f07
parent9f209f8f01771f97b6de29ab39edba172dbbf225
Merge from trunk.